From 30fe711fb57655561741bdf2acb057383f683677 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 27 Jun 2005 19:58:57 +0000
Subject: [PATCH] Olaf Klein contributes Garmin Mapsource ".gdb" format reader.

---
 gpsbabel/Makefile | 4 +++-
 gpsbabel/README   | 8 ++++++++
 gpsbabel/defs.h   | 1 +
 gpsbabel/vecs.c   | 7 +++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 5ac6fbb78..516fca846 100644
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -28,7 +28,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
 	ozi.o nmea.o text.o html.o palmdoc.o netstumbler.o hsa_ndv.o \
 	igc.o brauniger_iq.o shape.o hiketech.o glogbook.o coastexp.o \
 	vcf.o overlay.o kml.o google.o lowranceusr.o an1.o tomtom.o \
-	tef_xml.o maggeo.o pathaway.o vitosmt.o
+	tef_xml.o maggeo.o pathaway.o vitosmt.o gdb.o
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o trackfilter.o
 
@@ -191,6 +191,8 @@ magproto.o: magproto.c defs.h queue.h gbtypes.h magellan.h
 main.o: main.c defs.h queue.h gbtypes.h
 mapsend.o: mapsend.c defs.h queue.h gbtypes.h mapsend.h magellan.h
 mapsource.o: mapsource.c defs.h queue.h gbtypes.h garmin_tables.h
+gdb.o: gdb.c defs.h queue.h gbtypes.h garmin_tables.h \
+    jeeps/gpsmath.h garmin_tables.h
 mkshort.o: mkshort.c defs.h queue.h gbtypes.h
 navicache.o: navicache.c defs.h queue.h gbtypes.h
 netstumbler.o: netstumbler.c defs.h queue.h gbtypes.h csv_util.h
diff --git a/gpsbabel/README b/gpsbabel/README
index 906d45242..cc5a263c3 100644
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -845,6 +845,14 @@ THE FORMATS
 	VitoNavigator II on the Pocket PC.
 
 
+    GDB
+
+        Support for the "Garmin GPS Database" format used by default
+        in MapSource versions 6.1 and later. With this first step you
+        should be able to read waypoints, routes and tracks from .gdb
+        files.
+
+
 DATA FILTERS
 
 	GPSBabel supports data filtering.  Data filters are invoked from
diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 2a4880f78..8de80b592 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -462,6 +462,7 @@ void waypt_status_disp(int total_ct, int myct);
 void fatal(const char *, ...)
 #if __GNUC__
 	__attribute__ ((__format__ (__printf__, 1, 2)))
+	__attribute__((noreturn))
 #endif
 	;
 void warning(const char *, ...)
diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index c391b813b..a05e4339c 100644
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -83,6 +83,7 @@ extern ff_vecs_t tomtom_vecs;
 extern ff_vecs_t tef_xml_vecs;
 extern ff_vecs_t ppdb_vecs;
 extern ff_vecs_t vitosmt_vecs;
+extern ff_vecs_t gdb_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -405,6 +406,12 @@ vecs_t vec_list[] = {
 		"Vito Navigator II tracks",
 		"smt"
 	},	
+	{
+		&gdb_vecs,
+		"gdb",
+		"Garmin Database",
+		"gdb"
+	},	
 	{
 		NULL,
 		NULL,
-- 
2.30.2